Auto merge of #4308 - alexcrichton:bump, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 20 Jul 2017 16:03:36 +0000 (16:03 +0000)
committerbors <bors@rust-lang.org>
Thu, 20 Jul 2017 16:03:36 +0000 (16:03 +0000)
Bump to 0.22.0 and update deps


Trivial merge